search added + fixed possible injections