improved WP regexp