more fixed into: Hahmed/search api