easy search please work
merge fixes, sorry dude :)