improve search

remove unneeded const's