Fix catalog search bugs #1123 #1124

Fix #1123 Catalog search returns incorrect search results
Fix #1124 Catalog search returns max 10 search results