Modified query
Merged default to branch