added filters and update query on move.