remove query-based entries as DO NOT WORK!!!