added ransack search
merge