Merge branch 'beta'

Conflicts:
	lib/VNDB/Handler/Discussions.pm

6 files changed, 117 insertions, 237 deletions

diff --git a/lib/VNDB/Handler/Discussions.pm b/lib/VNDB/Handler/Discussions.pm
index 8f7ae76c..4cd9f04d 100644
--- a/lib/VNDB/Handler/Discussions.pm
+++ b/lib/VNDB/Handler/Discussions.pm
@@ -294,7 +294,7 @@ sub board {
     sort => $type eq 'an' ? 'id' : 'lastpost', reverse => 1,
   );
 
-  $self->htmlHeader(title => $title, noindex => 1);
+  $self->htmlHeader(title => $title, noindex => 1, feeds => [ $type eq 'an' ? 'announcements' : 'posts' ]);
 
   $self->htmlMainTabs($type, $obj, 'disc') if $iid;
   div class => 'mainbox';
@@ -330,7 +330,7 @@ sub board {
 sub index {
   my $self = shift;
 
-  $self->htmlHeader(title => mt('_disindex_title'), noindex => 1);
+  $self->htmlHeader(title => mt('_disindex_title'), noindex => 1, feeds => [ 'posts', 'announcements' ]);
   div class => 'mainbox';
    h1 mt '_disindex_title';
    p class => 'browseopts';
diff --git a/lib/VNDB/Handler/Misc.pm b/lib/VNDB/Handler/Misc.pm
index 87839730..b26868d5 100644
--- a/lib/VNDB/Handler/Misc.pm
+++ b/lib/VNDB/Handler/Misc.pm
@@ -15,7 +15,7 @@ YAWF::register(
   qr{d([1-9]\d*)},                   \&docpage,
   qr{setlang},                       \&setlang,
   qr{nospam},                        \&nospam,
-  qr{we-dont-like-ie6},              \&ie6message,
+  qr{we-dont-like-ie},               \&iemessage,
   qr{opensearch\.xml},               \&opensearch,
 
   # redirects for old URLs
@@ -37,7 +37,7 @@ YAWF::register(
 
 sub homepage {
   my $self = shift;
-  $self->htmlHeader(title => mt '_site_title');
+  $self->htmlHeader(title => mt('_site_title'), feeds => [ keys %{$self->{atom_feeds}} ]);
 
   div class => 'mainbox';
    h1 mt '_site_title';
@@ -63,7 +63,8 @@ sub homepage {
     # Recent changes
     td;
      h1;
-      a href => '/hist', mt '_home_recentchanges';
+      a href => '/hist', mt '_home_recentchanges'; txt ' ';
+      a href => '/feeds/changes.atom'; cssicon 'feed', mt '_atom_feed'; end;
      end;
      my $changes = $self->dbRevisionGet(what => 'item user', results => 10, auto => 1);
      ul;
@@ -82,7 +83,8 @@ sub homepage {
     td;
      my $an = $self->dbThreadGet(type => 'an', sort => 'id', reverse => 1, results => 2);
      h1;
-      a href => '/t/an', mt '_home_announcements';
+      a href => '/t/an', mt '_home_announcements'; txt ' ';
+      a href => '/feeds/announcements.atom'; cssicon 'feed', mt '_atom_feed'; end;
      end;
      for (@$an) {
        my $post = $self->dbPostGet(tid => $_->{id}, num => 1)->[0];
@@ -98,7 +100,8 @@ sub homepage {
     # Recent posts
     td;
      h1;
-      a href => '/t', mt '_home_recentposts';
+      a href => '/t', mt '_home_recentposts'; txt ' ';
+      a href => '/feeds/posts.atom'; cssicon 'feed', mt '_atom_feed'; end;
      end;
      my $posts = $self->dbThreadGet(what => 'lastpost boardtitles', results => 10, sort => 'lastpost', reverse => 1, notusers => 1);
      ul;
@@ -135,7 +138,7 @@ sub homepage {
     # Upcoming releases
     td;
      h1;
-      a href => strftime('/r?mi=%Y%m%d;o=a;s=released', gmtime), mt '_home_upcoming';
+      a href => strftime('/r?fil=date_after-%Y%m%d;o=a;s=released', gmtime), mt '_home_upcoming';
      end;
      my $upcoming = $self->dbReleaseGet(results => 10, unreleased => 1, what => 'platforms');
      ul;
@@ -155,7 +158,7 @@ sub homepage {
     # Just released
     td;
      h1;
-      a href => strftime('/r?ma=%Y%m%d;o=d;s=released', gmtime), mt '_home_justreleased';
+      a href => strftime('/r?fil=date_before-%Y%m%d;o=d;s=released', gmtime), mt '_home_justreleased';
      end;
      my $justrel = $self->dbReleaseGet(results => 10, sort => 'released', reverse => 1, unreleased => 0, what => 'platforms');
      ul;
@@ -216,7 +219,7 @@ sub history {
     releases => $f->{r},
   );
 
-  $self->htmlHeader(title => $title, noindex => 1);
+  $self->htmlHeader(title => $title, noindex => 1, feeds => [ 'changes' ]);
   $self->htmlMainTabs($type, $obj, 'hist') if $type;
 
   # url generator
@@ -361,12 +364,12 @@ sub nospam {
 }
 
 
-sub ie6message {
+sub iemessage {
   my $self = shift;
 
   if($self->reqParam('i-still-want-access')) {
     (my $ref = $self->reqHeader('Referer') || '/') =~ s/^\Q$self->{url}//;
-    $ref = '/' if $ref eq '/we-dont-like-ie6';
+    $ref = '/' if $ref eq '/we-dont-like-ie';
     $self->resRedirect($ref, 'temp');
     $self->resHeader('Set-Cookie', "ie-sucks=1; path=/; domain=$self->{cookie_domain}");
     return;
@@ -386,16 +389,16 @@ sub ie6message {
     div;
      h1 'Oops, we were too lazy to support your browser!';
      p;
-      lit qq|We decided to stop supporting Internet Explorer 6, as it's a royal pain in |
+      lit qq|We decided to stop supporting Internet Explorer 6 and 7, as it's a royal pain in |
          .qq|the ass to make our site look good in a browser that doesn't want to cooperate with us.<br />|
          .qq|You can try one of the following free alternatives: |
          .qq|<a href="http://www.mozilla.com/firefox/">Firefox</a>, |
          .qq|<a href="http://www.opera.com/">Opera</a>, |
          .qq|<a href="http://www.apple.com/safari/">Safari</a>, or |
          .qq|<a href="http://www.google.com/chrome">Chrome</a>.<br /><br />|
-         .qq|If you're really stubborn about using Internet Explorer, upgrading to version 7 will also work.<br /><br />|
+         .qq|If you're really stubborn about using Internet Explorer, upgrading to version 8 will also work.<br /><br />|
          .qq|...and if you're mad, you can also choose to ignore this warning and |
-         .qq|<a href="/we-dont-like-ie6?i-still-want-access=1">open the site anyway</a>.|;
+         .qq|<a href="/we-dont-like-ie?i-still-want-access=1">open the site anyway</a>.|;
      end;
     end;
    end;
diff --git a/lib/VNDB/Handler/Producers.pm b/lib/VNDB/Handler/Producers.pm
index 2931e25f..6e11e829 100644
--- a/lib/VNDB/Handler/Producers.pm
+++ b/lib/VNDB/Handler/Producers.pm
@@ -60,13 +60,13 @@ sub page {
       [ type      => serialize => sub { mt "_ptype_$_[0]" } ],
       [ name      => diff => 1 ],
       [ original  => diff => 1 ],
-      [ alias     => diff => 1 ],
+      [ alias     => diff => qr/[ ,\n\.]/ ],
       [ lang      => serialize => sub { "$_[0] (".mt("_lang_$_[0]").')' } ],
       [ website   => diff => 1 ],
       [ l_wp      => htmlize => sub {
         $_[0] ? sprintf '<a href="http://en.wikipedia.org/wiki/%s">%1$s</a>', xml_escape $_[0] : mt '_revision_nolink'
       }],
-      [ desc      => diff => 1 ],
+      [ desc      => diff => qr/[ ,\n\.]/ ],
       [ relations   => join => '<br />', split => sub {
         my @r = map sprintf('%s: <a href="/p%d" title="%s">%s</a>',
           mt("_prodrel_$_->{relation}"), $_->{id}, xml_escape($_->{original}||$_->{name}), xml_escape shorten $_->{name}, 40
@@ -153,6 +153,10 @@ sub _releases {
        td colspan => 6;
         i; lit $self->{l10n}->datestr($vn{$v->{vid}}[0]{released}); end;
         a href => "/v$v->{vid}", title => $v->{original}, $v->{title};
+        span '('.join(', ',
+           (grep($_->{developer}, @{$vn{$v->{vid}}}) ? mt '_prodpage_dev' : ()),
+           (grep($_->{publisher}, @{$vn{$v->{vid}}}) ? mt '_prodpage_pub' : ())
+        ).')';
        end;
       end;
       for my $rel (@{$vn{$v->{vid}}}) {
diff --git a/lib/VNDB/Handler/Releases.pm b/lib/VNDB/Handler/Releases.pm
index f9c600bd..e2a18e1a 100644
--- a/lib/VNDB/Handler/Releases.pm
+++ b/lib/VNDB/Handler/Releases.pm
@@ -51,7 +51,7 @@ sub page {
       [ 'website' ],
       [ released   => htmlize   => sub { $self->{l10n}->datestr($_[0]) } ],
       [ minage     => serialize => \&minage ],
-      [ notes      => diff => 1 ],
+      [ notes      => diff => qr/[ ,\n\.]/ ],
       [ platforms  => join => ', ', split => sub { map mt("_plat_$_"), @{$_[0]} } ],
       [ media      => join => ', ', split => sub {
         map $self->{media}{$_->{medium}} ? $_->{qty}.' '.mt("_med_$_->{medium}", $_->{qty}) : mt("_med_$_->{medium}",1), @{$_[0]}
@@ -485,60 +485,46 @@ sub browse {
 
   my $f = $self->formValidate(
     { name => 'p',  required => 0, default => 1, template => 'int' },
-    { name => 's',  required => 0, default => 'title', enum => [qw|released minage title|] },
     { name => 'o',  required => 0, default => 'a', enum => ['a', 'd'] },
     { name => 'q',  required => 0, default => '', maxlength => 500 },
-    { name => 'ln', required => 0, multi => 1, default => '', enum => $self->{languages} },
-    { name => 'pl', required => 0, multi => 1, default => '', enum => $self->{platforms} },
-    { name => 'me', required => 0, multi => 1, default => '', enum => [ keys %{$self->{media}} ] },
-    { name => 'tp', required => 0, default => '', enum => [ '', @{$self->{release_types}} ] },
-    { name => 'pa', required => 0, default => 0, enum => [ 0..2 ] },
-    { name => 'fw', required => 0, default => 0, enum => [ 0..2 ] },
-    { name => 'do', required => 0, default => 0, enum => [ 0..2 ] },
-    { name => 'ma_m', required => 0, default => 0, enum => [ 0, 1 ] },
-    { name => 'ma_a', required => 0, default => 0, enum => [ grep defined($_), @{$self->{age_ratings}} ] },
-    { name => 'mi', required => 0, default => 0, template => 'int' },
-    { name => 'ma', required => 0, default => 99999999, template => 'int' },
-    { name => 're', required => 0, multi => 1, default => 0, enum => [ 1..$#{$self->{resolutions}} ] },
+    { name => 's',  required => 0, default => 'title', enum => [qw|released minage title|] },
+    { name => 'fil',required => 0, default => '' },
   );
   return 404 if $f->{_err};
 
-  my @filters = (
-    $f->{mi} > 0 || $f->{ma} < 99990000 ? (date => [ $f->{mi}, $f->{ma} ]) : (),
-    $f->{q} ? (search => $f->{q}) : (),
-    $f->{pl}[0] ? (platforms => $f->{pl}) : (),
-    $f->{ln}[0] ? (languages => $f->{ln}) : (),
-    $f->{me}[0] ? (media => $f->{me}) : (),
-    $f->{re}[0] ? (resolutions => $f->{re} ) : (),
-    $f->{tp} ? (type => $f->{tp}) : (),
-    $f->{ma_a} || $f->{ma_m} ? (minage => [$f->{ma_m}, $f->{ma_a}]) : (),
-    $f->{pa} ? (patch => $f->{pa}) : (),
-    $f->{fw} ? (freeware => $f->{fw}) : (),
-    $f->{do} ? (doujin => $f->{do}) : (),
-  );
-  my($list, $np) = !@filters ? ([], 0) : $self->dbReleaseGet(
+  my $fil = fil_parse $f->{fil}, qw|type patch freeware doujin date_before date_after minage lang olang resolution plat med voiced ani_story ani_ero|;
+  _fil_compat($self, $fil);
+  $f->{fil} = fil_serialize($fil);
+
+  my($list, $np) = !$f->{q} && !keys %$fil ? ([], 0) : $self->dbReleaseGet(
     sort => $f->{s}, reverse => $f->{o} eq 'd',
     page => $f->{p},
     results => 50,
     what => 'platforms',
-    @filters,
+    $f->{q} ? ( search => $f->{q} ) : (),
+    %$fil
   );
 
-  my $url = "/r?tp=$f->{tp};pa=$f->{pa};ma_m=$f->{ma_m};ma_a=$f->{ma_a};q=$f->{q};mi=$f->{mi};ma=$f->{ma};do=$f->{do};fw=$f->{fw}";
-  $_&&($url .= ";ln=$_") for @{$f->{ln}};
-  $_&&($url .= ";pl=$_") for @{$f->{pl}};
-  $_&&($url .= ";re=$_") for @{$f->{re}};
-  $_&&($url .= ";me=$_") for @{$f->{me}};
-
   $self->htmlHeader(title => mt('_rbrowse_title'));
-  _filters($self, $f, !@filters || !@$list);
+
+  form method => 'get', action => '/r', 'accept-charset' => 'UTF-8';
+  div class => 'mainbox';
+   h1 mt '_rbrowse_title';
+   $self->htmlSearchBox('r', $f->{q});
+   a id => 'filselect', href => '#r';
+    lit '<i>&#9656;</i> '.mt('_rbrowse_filters').'<i></i>';
+   end;
+   input type => 'hidden', class => 'hidden', name => 'fil', id => 'fil', value => $f->{fil};
+  end;
+  end;
+
   $self->htmlBrowse(
     class    => 'relbrowse',
     items    => $list,
     options  => $f,
     nextpage => $np,
-    pageurl  => "$url;s=$f->{s};o=$f->{o}",
-    sorturl  => $url,
+    pageurl  => "/r?q=$f->{q};fil=$f->{fil};s=$f->{s};o=$f->{o}",
+    sorturl  => "/r?q=$f->{q};fil=$f->{fil}",
     header   => [
       [ mt('_rbrowse_col_released'), 'released' ],
       [ mt('_rbrowse_col_minage'),   'minage' ],
@@ -564,7 +550,7 @@ sub browse {
       end;
     },
   ) if @$list;
-  if(@filters && !@$list) {
+  if(($f->{q} || keys %$fil) && !@$list) {
     div class => 'mainbox';
      h1 mt '_rbrowse_noresults_title';
      div class => 'notice';
@@ -576,108 +562,35 @@ sub browse {
 }
 
 
-sub _filters {
-  my($self, $f, $shown) = @_;
-
-  form method => 'get', action => '/r', 'accept-charset' => 'UTF-8';
-  div class => 'mainbox';
-   h1 mt '_rbrowse_title';
-
-   $self->htmlSearchBox('r', $f->{q});
-
-   a id => 'advselect', href => '#';
-    lit '<i>'.($shown?'&#9662;':'&#9656;').'</i> '.mt('_rbrowse_filters');
-   end;
-   div id => 'advoptions', !$shown ? (class => 'hidden') : ();
-
-    h2 mt '_rbrowse_filters';
-    table class => 'formtable', style => 'margin-left: 0';
-     Tr class => 'newfield';
-      td class => 'label'; label for => 'ma_m', mt '_rbrowse_minage'; end;
-      td class => 'field';
-       Select id => 'ma_m', name => 'ma_m', style => 'width: 160px';
-        option value => 0, $f->{ma_m} == 0 ? ('selected' => 'selected') : (), mt '_rbrowse_ge';
-        option value => 1, $f->{ma_m} == 1 ? ('selected' => 'selected') : (), mt '_rbrowse_le';
-       end;
-       Select id => 'ma_a', name => 'ma_a', style => 'width: 80px; text-align: center';
-        defined($_) && option value => $_, $f->{ma_a} == $_ ? ('selected' => 'selected') : (), minage $_
-          for (@{$self->{age_ratings}});
-       end;
-      end;
-      td rowspan => 5, style => 'padding-left: 40px';
-       label for => 're', mt '_rbrowse_resolution'; br;
-       Select id => 're', name => 're', multiple => 'multiple', size => 8;
-        my $l='';
-        for my $i (1..$#{$self->{resolutions}}) {
-          if($l ne $self->{resolutions}[$i][1]) {
-            end if $l;
-            $l = $self->{resolutions}[$i][1];
-            optgroup label => $l;
-          }
-          option value => $i, scalar grep($i==$_, @{$f->{re}}) ? (selected => 'selected') : (), $self->{resolutions}[$i][0];
-        }
-        end if $l;
-       end;
-      end;
-     end;
-     $self->htmlFormPart($f, [ select => short => 'tp', name => mt('_rbrowse_type'),
-       options => [ ['', mt '_rbrowse_all'], map [ $_, mt "_rtype_$_" ], @{$self->{release_types}} ]]);
-     $self->htmlFormPart($f, [ select => short => 'pa', name => mt('_rbrowse_patch'),
-       options => [ [0, mt '_rbrowse_all' ], [1, mt '_rbrowse_patchonly'], [2, mt '_rbrowse_patchnone']]]);
-     $self->htmlFormPart($f, [ select => short => 'fw', name => mt('_rbrowse_freeware'),
-       options => [ [0, mt '_rbrowse_all' ], [1, mt '_rbrowse_freewareonly'], [2, mt '_rbrowse_freewarenone']]]);
-     $self->htmlFormPart($f, [ select => short => 'do', name => mt('_rbrowse_doujin'),
-       options => [ [0, mt '_rbrowse_all' ], [1, mt '_rbrowse_doujinonly'], [2, mt '_rbrowse_doujinnone']]]);
-     $self->htmlFormPart($f, [ date => short => 'mi', name => mt '_rbrowse_dateafter' ]);
-     $self->htmlFormPart($f, [ date => short => 'ma', name => mt '_rbrowse_datebefore' ]);
-    end;
-
-    h2;
-     txt mt '_rbrowse_languages';
-     b ' ('.mt('_rbrowse_boolor').')';
-    end;
-    for my $i (@{$self->{languages}}) {
-      span;
-       input type => 'checkbox', name => 'ln', value => $i, id => "lang_$i", grep($_ eq $i, @{$f->{ln}}) ? (checked => 'checked') : ();
-       label for => "lang_$i";
-        cssicon "lang $i", mt "_lang_$i";
-        txt mt "_lang_$i";
-       end;
-      end;
-    }
-
-    h2;
-     txt mt '_rbrowse_platforms';
-     b ' ('.mt('_rbrowse_boolor').')';
-    end;
-    for my $i (sort @{$self->{platforms}}) {
-      span;
-       input type => 'checkbox', name => 'pl', value => $i, id => "plat_$i", grep($_ eq $i, @{$f->{pl}}) ? (checked => 'checked') : ();
-       label for => "plat_$i";
-        cssicon $i, mt "_plat_$i";
-        txt mt "_plat_$i";
-       end;
-      end;
-    }
-
-    h2;
-     txt mt '_rbrowse_media';
-     b ' ('.mt('_rbrowse_boolor').')';
-    end;
-    for my $i (sort keys %{$self->{media}}) {
-      span;
-       input type => 'checkbox', name => 'me', value => $i, id => "med_$i", grep($_ eq $i, @{$f->{me}}) ? (checked => 'checked') : ();
-       label for => "med_$i", mt "_med_$i", 1;
-      end;
-    }
-
-    div style => 'text-align: center; clear: left;';
-     input type => 'submit', value => mt('_rbrowse_apply'), class => 'submit';
-     input type => 'reset', value => mt('_rbrowse_clear'), class => 'submit', onclick => 'location.href="/r"';
-    end;
-   end;
-  end;
-  end;
+# provide compatibility with old filter URLs
+sub _fil_compat {
+  my($self, $fil) = @_;
+  my $f = $self->formValidate(
+    { name => 'ln', required => 0, multi => 1, default => '', enum => $self->{languages} },
+    { name => 'pl', required => 0, multi => 1, default => '', enum => $self->{platforms} },
+    { name => 'me', required => 0, multi => 1, default => '', enum => [ keys %{$self->{media}} ] },
+    { name => 'tp', required => 0, default => '', enum => [ '', @{$self->{release_types}} ] },
+    { name => 'pa', required => 0, default => 0, enum => [ 0..2 ] },
+    { name => 'fw', required => 0, default => 0, enum => [ 0..2 ] },
+    { name => 'do', required => 0, default => 0, enum => [ 0..2 ] },
+    { name => 'ma_m', required => 0, default => 0, enum => [ 0, 1 ] },
+    { name => 'ma_a', required => 0, default => 0, enum => [ grep defined($_), @{$self->{age_ratings}} ] },
+    { name => 'mi', required => 0, default => 0, template => 'int' },
+    { name => 'ma', required => 0, default => 99999999, template => 'int' },
+    { name => 're', required => 0, multi => 1, default => 0, enum => [ 1..$#{$self->{resolutions}} ] },
+  );
+  return if $f->{_err};
+  $fil->{minage} //= [ grep defined($_) && $f->{ma_m} ? $f->{ma_a} >= $_ : $f->{ma_a} <= $_, @{$self->{age_ratings}} ] if $f->{ma_a} || $f->{ma_m};
+  $fil->{date_after} //= $f->{mi}  if $f->{mi};
+  $fil->{date_before} //= $f->{ma} if $f->{ma} < 99990000;
+  $fil->{plat} //= $f->{pl}        if $f->{pl}[0];
+  $fil->{lang} //= $f->{ln}        if $f->{ln}[0];
+  $fil->{med} //= $f->{me}         if $f->{me}[0];
+  $fil->{resolution} //= $f->{re}  if $f->{re}[0];
+  $fil->{type} //= $f->{tp}        if $f->{tp};
+  $fil->{patch} //= $f->{pa} == 2 ? 0 : 1 if $f->{pa};
+  $fil->{freeware} //= $f->{fw} == 2 ? 0 : 1 if $f->{fw};
+  $fil->{doujin} //= $f->{do} == 2 ? 0 : 1 if $f->{do};
 }
 
 
diff --git a/lib/VNDB/Handler/VNBrowse.pm b/lib/VNDB/Handler/VNBrowse.pm
index f3193b57..8e30da99 100644
--- a/lib/VNDB/Handler/VNBrowse.pm
+++ b/lib/VNDB/Handler/VNBrowse.pm
@@ -21,14 +21,12 @@ sub list {
     { name => 'p', required => 0, default => 1, template => 'int' },
     { name => 'q', required => 0, default => '' },
     { name => 'sq', required => 0, default => '' },
-    { name => 'ln', required => 0, multi => 1, enum => $self->{languages}, default => '' },
-    { name => 'pl', required => 0, multi => 1, enum => $self->{platforms}, default => '' },
-    { name => 'ti', required => 0, default => '', maxlength => 200 },
-    { name => 'te', required => 0, default => '', maxlength => 200 },
-    { name => 'sp', required => 0, default => $self->reqCookie($self->{cookie_prefix}.'tagspoil') =~ /^([0-2])$/ ? $1 : 0, enum => [0..2] },
+    { name => 'fil',required => 0, default => '' },
   );
   return 404 if $f->{_err};
   $f->{q} ||= $f->{sq};
+  my $fil = fil_parse $f->{fil}, qw|length hasani taginc tagexc tagspoil lang olang plat|;
+  _fil_compat($self, $fil);
 
   if($f->{q}) {
     return $self->resRedirect('/'.$1.$2.(!$3 ? '' : $1 eq 'd' ? '#'.$3 : '.'.$3), 'temp')
@@ -37,9 +35,11 @@ sub list {
     # for URL compatibilty with older versions (ugly hack to get English strings)
     my @lang;
     $f->{q} =~ s/\s*$VNDB::L10N::en::Lexicon{"_lang_$_"}\s*//&&push @lang, $_ for (@{$self->{languages}});
-    $f->{ln} = $f->{ln}[0] ? [ @{$f->{ln}}, @lang ] : \@lang;
+    $fil->{lang} = $fil->{lang} ? [ ref($fil->{lang}) ? @{$fil->{lang}} : $fil->{lang}, @lang ] : \@lang if @lang;
   }
+  $f->{fil} = fil_serialize $fil;
 
+  # TODO: this should be moved to dbVNGet() in order for savable VN filters to be useful
   my @ignored;
   my $tagfind = sub {
     return map {
@@ -47,10 +47,10 @@ sub list {
       push @ignored, [$_, 0] if !$i;
       push @ignored, [$_, 1] if $i && $i->{meta};
       $i && !$i->{meta} ? $i->{id} : ();
-    } grep $_, split /\s*,\s*/, $_[0];
+    } grep $_, ref $_[0] ? @{$_[0]} : ($_[0]||'')
   };
-  my @ti = $tagfind->($f->{ti});
-  my @te = $tagfind->($f->{te});
+  my @ti = $tagfind->(delete $fil->{taginc});
+  my @te = $tagfind->(delete $fil->{tagexc});
 
   $f->{s} = 'title' if !@ti && $f->{s} eq 'tagscore';
   $f->{o} = $f->{s} eq 'tagscore' ? 'd' : 'a' if !$f->{o};
@@ -62,28 +62,15 @@ sub list {
     results => 50,
     page => $f->{p},
     sort => $f->{s}, reverse => $f->{o} eq 'd',
-    $f->{pl}[0] ? ( platform => $f->{pl} ) : (),
-    $f->{ln}[0] ? ( lang => $f->{ln} ) : (),
-    @ti ? (tags_include => [ $f->{sp}, \@ti ]) : (),
+    @ti ? (tags_include => [ delete $fil->{tagspoil}, \@ti ]) : (),
     @te ? (tags_exclude => \@te) : (),
+    %$fil
   );
 
   $self->resRedirect('/v'.$list->[0]{id}, 'temp')
     if $f->{q} && @$list == 1 && $f->{p} == 1;
 
   $self->htmlHeader(title => mt('_vnbrowse_title'), search => $f->{q});
-  _filters($self, $f, $char, \@ignored);
-
-  my $url = "/v/$char?q=$f->{q};ti=$f->{ti};te=$f->{te}";
-  $_ and $url .= ";pl=$_" for @{$f->{pl}};
-  $_ and $url .= ";ln=$_" for @{$f->{ln}};
-  $self->htmlBrowseVN($list, $f, $np, $url, scalar @ti);
-  $self->htmlFooter;
-}
-
-
-sub _filters {
-  my($self, $f, $char, $ign) = @_;
 
   form action => '/v/all', 'accept-charset' => 'UTF-8', method => 'get';
   div class => 'mainbox';
@@ -91,72 +78,45 @@ sub _filters {
    $self->htmlSearchBox('v', $f->{q});
    p class => 'browseopts';
     for ('all', 'a'..'z', 0) {
-      a href => "/v/$_", $_ eq $char ? (class => 'optselected') : (), $_ eq 'all' ? mt('_char_all') : $_ ? uc $_ : '#';
+      a href => "/v/$_?q=$f->{q};fil=$f->{fil}", $_ eq $char ? (class => 'optselected') : (), $_ eq 'all' ? mt('_char_all') : $_ ? uc $_ : '#';
     }
    end;
 
-   if(@$ign) {
+   if(@ignored) {
      div class => 'warning';
       h2 mt '_vnbrowse_tagign_title';
       ul;
-       li $_->[0].' ('.mt('_vnbrowse_tagign_'.($_->[1]?'meta':'notfound')).')' for @$ign;
+       li $_->[0].' ('.mt('_vnbrowse_tagign_'.($_->[1]?'meta':'notfound')).')' for @ignored;
       end;
      end;
    }
 
-   a id => 'advselect', href => '#';
-    lit '<i>&#9656;</i> '.mt('_vnbrowse_advsearch');
+   a id => 'filselect', href => '#v';
+    lit '<i>&#9656;</i> '.mt('_rbrowse_filters').'<i></i>'; # TODO: it's not *r*browse
    end;
-   div id => 'advoptions', class => 'hidden vnoptions';
-
-    h2;
-     txt mt '_vnbrowse_tags';
-     b ' ('.mt('_vnbrowse_booland').')';
-    end;
-    table class => 'formtable', style => 'margin-left: 0';
-     $self->htmlFormPart($f, [ input => short => 'ti', name => mt('_vnbrowse_taginc'), width => 350 ]);
-     $self->htmlFormPart($f, [ radio => short => 'sp', name => '', options => [map [$_, mt '_vnbrowse_spoil'.$_], 0..2]]);
-     $self->htmlFormPart($f, [ input => short => 'te', name => mt('_vnbrowse_tagexc'), width => 350 ]);
-    end;
-
-    h2;
-     txt mt '_vnbrowse_lang';
-     b ' ('.mt('_vnbrowse_boolor').')';
-    end;
-    for my $i (@{$self->{languages}}) {
-      span;
-       input type => 'checkbox', name => 'ln', value => $i, id => "lang_$i",
-         (scalar grep $_ eq $i, @{$f->{ln}}) ? (checked => 'checked') : ();
-       label for => "lang_$i";
-        cssicon "lang $i", mt "_lang_$i";
-        txt mt "_lang_$i";
-       end;
-      end;
-    }
+   input type => 'hidden', class => 'hidden', name => 'fil', id => 'fil', value => $f->{fil};
+  end;
+  end; # /form
 
-    h2;
-     txt mt '_vnbrowse_plat';
-     b ' ('.mt('_vnbrowse_boolor').')';
-    end;
-    for my $i (sort @{$self->{platforms}}) {
-      next if $i eq 'oth';
-      span;
-       input type => 'checkbox', id => "plat_$i", name => 'pl', value => $i,
-         (scalar grep $_ eq $i, @{$f->{pl}}) ? (checked => 'checked') : ();
-       label for => "plat_$i";
-        cssicon $i, mt "_plat_$i";
-        txt mt "_plat_$i";
-       end;
-      end;
-    }
+  $self->htmlBrowseVN($list, $f, $np, "/v/$char?q=$f->{q};fil=$f->{fil}", scalar @ti);
+  $self->htmlFooter;
+}
 
-    div style => 'text-align: center; clear: left;';
-     input type => 'submit', value => mt('_vnbrowse_apply'), class => 'submit';
-     input type => 'reset', value => mt('_vnbrowse_clear'), class => 'submit', onclick => 'location.href="/v/all"';
-    end;
-   end;
-  end;
-  end;
+
+sub _fil_compat {
+  my($self, $fil) = @_;
+  my $f = $self->formValidate(
+    { name => 'ln', required => 0, multi => 1, enum => $self->{languages}, default => '' },
+    { name => 'pl', required => 0, multi => 1, enum => $self->{platforms}, default => '' },
+    { name => 'ti', required => 0, default => '', maxlength => 200 },
+    { name => 'te', required => 0, default => '', maxlength => 200 },
+    { name => 'sp', required => 0, default => $self->reqCookie($self->{cookie_prefix}.'tagspoil') =~ /^([0-2])$/ ? $1 : 0, enum => [0..2] },
+  );
+  $fil->{lang}     //= $f->{ln} if $f->{ln}[0];
+  $fil->{plat}     //= $f->{pl} if $f->{pl}[0];
+  $fil->{taginc}   //= $f->{ti} if $f->{ti};
+  $fil->{tagexc}   //= $f->{te} if $f->{te};
+  $fil->{tagspoil} //= $f->{sp};
 }
 
 
diff --git a/lib/VNDB/Handler/VNPage.pm b/lib/VNDB/Handler/VNPage.pm
index 4a4b3f4f..1a3eb514 100644
--- a/lib/VNDB/Handler/VNPage.pm
+++ b/lib/VNDB/Handler/VNPage.pm
@@ -191,8 +191,8 @@ sub _revision {
   $self->htmlRevision('v', $prev, $v,
     [ title       => diff => 1 ],
     [ original    => diff => 1 ],
-    [ alias       => diff => 1 ],
-    [ desc        => diff => 1 ],
+    [ alias       => diff => qr/[ ,\n\.]/ ],
+    [ desc        => diff => qr/[ ,\n\.]/ ],
     [ length      => serialize => sub { mt '_vnlength_'.$_[0] } ],
     [ l_wp        => htmlize => sub {
       $_[0] ? sprintf '<a href="http://en.wikipedia.org/wiki/%s">%1$s</a>', xml_escape $_[0] : mt '_revision_nolink'