removed id filter where not needed
fixed domain thing again