Issue #297 using where instead of find_all