fixed queries for tune_type and composer_type