Fixed all "my" queries