Modified search related scripts (I)