need to merge
merged
working on search query this is just for backup push