updated ransack FINALLY