Final refactor, migrated feature custom search query.
All features migrated