Data bugs
implemented search