Fixed query and settings features.