Minor changes on where function