Numerous features for scanning and filtering AP added.