this is making things ready for enabling more advanced search features.