Minor fixes

+ Minor cleanup
+ More delimiters and query returns results on the same format as that
given, i.e. querying for "name:a" returns "name:asus" but "name:(a"
returns "name:(asus"