Fix #12: The last fix introduced a bug with the "get_post_type_archive_link" function. I change a filter priority and it seem fixed.