Add initial error detection & filter search queries
1.2.1