attributes added, dbl click added
query corrected