#488 Some more refactoring in search view