fixing rails 4.2 optional scope issue ?