Code

Some changes, added better filter management for ProfileEntry