Revert "Complete Search with user preferences and field validations"

This reverts commit 8893fdd8f69a604b501a8b3016f2668b4cbd31dd.