Fix wrong query & change plugin version