Split first part of Core into Defines, fix flush filter with it