Adding and operation to search - a few things are broken now...