Fixes for using ransack