Mob 2377

This is not a new code (just change places) - we should address this issues together with filter box refactoring