updated searching and records queries
merged