improve search

but still danymic takeaway not working