Fixed bugs in handling "p4 where"