Full queries reworked for evo and static SCM. Much cleaner!!!