Changed hardcoded strings in some querys