FIX remove siteid filter