Added before filters for following issues