fixed includes and select as they are modifiers
Merge branch 'fix_load_all' into chris_rails4