Cleaned up and fixed search logic. Also fixed observation page issue.