Added missing character queries
Added attribute queries