fix'ed namespace removal for db queries