Merge branch 'release/v2.1'
Merge tag 'v2.1' into develop

Fixed query to avoid injection and stop being dumb