Some minor adjustments + added pagination for search results