Fixed #13
Fixed search not passing object name even if it's available