Revert "As-is commit - not working perfectly"

This reverts commit d9b2fd45869145b725a3ab13da85ab12d50ef9a9.
Working basic search on main fields.