made some "where" enhancements