added geographic functionality and wildcards