added generic query again