increased max results count
refactoring