fix handler filtering
preparing for publish