new predefined queries + fixes on old ones