created two selectors + fixed bug in afw