Fixed searching issues. layout and searching by description