Fixed asston of bugs, added queries and replacers