Move some more features to search const