Fixed UAV kicks for real this time
Modified some filters to use regex