diff --git a/include/appbyvendor_inc.php b/include/appbyvendor.php
similarity index 100%
rename from include/appbyvendor_inc.php
rename to include/appbyvendor.php
diff --git a/include/appversion_inc.php b/include/appversion.php
similarity index 100%
rename from include/appversion_inc.php
rename to include/appversion.php
diff --git a/include/qclass.php b/include/qclass.php
index e284209..f360187 100644
--- a/include/qclass.php
+++ b/include/qclass.php
@@ -1,9 +1,9 @@
 <?php
-/*************************************************************/
-/* query class                                               */
-/* (de)compose/exec queries                                  */
-/* this should have query_inc.php's query preprocessing etc. */
-/*************************************************************/
+/*********************************************************/
+/* query class                                           */
+/* (de)compose/exec queries                              */
+/* this should have query.php's query preprocessing etc. */
+/*********************************************************/
 
 class qclass {
 
diff --git a/include/query_inc.php b/include/query.php
similarity index 97%
rename from include/query_inc.php
rename to include/query.php
index 5df0667..cab9d7a 100644
--- a/include/query_inc.php
+++ b/include/query.php
@@ -1,8 +1,8 @@
 <?php
 
 
-include(BASE."include/"."appversion_inc.php");
-include(BASE."include/"."appbyvendor_inc.php");
+include(BASE."include/"."appversion.php");
+include(BASE."include/"."appbyvendor.php");
 
 function initFields()
 {
diff --git a/include/query_appbyvendor.php b/include/query_appbyvendor.php
index 0303fdc..a250f59 100644
--- a/include/query_appbyvendor.php
+++ b/include/query_appbyvendor.php
@@ -1,3 +1,118 @@
+<?php
+
+
+function create_appbyvendorsearch_url($vName)
+{
+        global $fields, $orderby, $join;
+
+	$orderby = "appId";
+	$fields[] = "vendor.vendorId";
+	$fields[] = "appFamily.appId";
+	$fields[] = "appFamily.appName";
+	$fields[] = "appFamily.webPage";
+	$join = "appFamily.vendorId=vendor.vendorId";
+
+	$searchwhat = "vendor.vendorId";
+
+	$url = "stdquery.php";
+	$url .= "?orderby=$orderby";
+	$url .= "&searchfor=$vName";
+	$url .= "&searchwhat=$searchwhat";
+	$url .= "&join=$join";
+
+	foreach($fields as $aField)
+	{
+		$url .= "&fields[]=$aField";
+	}
+
+	$url .= "&linesPerPage=$linesPerPage";
+
+	return $url;
+}
+
+function output_appbyvendor_forminputs()
+{
+        global $fields, $orderby, $join;
+
+	$orderby = "appId";
+	$fields[] = "vendor.vendorId";
+	$fields[] = "appFamily.appId";
+	$fields[] = "appFamily.appName";
+	$fields[] = "appFamily.webPage";
+	$join = "appFamily.vendorId=vendor.vendorId";
+
+
+	$searchwhat = "vendor.vendorName";
+
+	echo "<input TYPE=\"HIDDEN\" NAME=\"orderby\" VALUE=\"$orderby\">
+	    <input TYPE=\"HIDDEN\" NAME=\"searchwhat\" VALUE=\"$searchwhat\">";
+
+	foreach($fields as $aField)
+	{
+	    echo "<input TYPE=\"HIDDEN\" NAME=\"fields[]\" VALUE=\"$aField\">";
+	}
+
+	echo "<input TYPE=\"HIDDEN\" NAME=\"join\" VALUE=\"$join\">";
+}
+
+?>
+<?php
+
+function create_appbyvendorsearch_url($vName)
+{
+        global $fields, $orderby, $join;
+
+	$orderby = "appId";
+	$fields[] = "vendor.vendorId";
+	$fields[] = "appFamily.appId";
+	$fields[] = "appFamily.appName";
+	$fields[] = "appFamily.webPage";
+	$join = "appFamily.vendorId=vendor.vendorId";
+
+	$searchwhat = "vendor.vendorId";
+
+	$url = "stdquery.php";
+	$url .= "?orderby=$orderby";
+	$url .= "&searchfor=$vName";
+	$url .= "&searchwhat=$searchwhat";
+	$url .= "&join=$join";
+
+	foreach($fields as $aField)
+	{
+		$url .= "&fields[]=$aField";
+	}
+
+	$url .= "&linesPerPage=$linesPerPage";
+
+	return $url;
+}
+
+function output_appbyvendor_forminputs()
+{
+        global $fields, $orderby, $join;
+
+	$orderby = "appId";
+	$fields[] = "vendor.vendorId";
+	$fields[] = "appFamily.appId";
+	$fields[] = "appFamily.appName";
+	$fields[] = "appFamily.webPage";
+	$join = "appFamily.vendorId=vendor.vendorId";
+
+
+	$searchwhat = "vendor.vendorName";
+
+	echo "<input TYPE=\"HIDDEN\" NAME=\"orderby\" VALUE=\"$orderby\">
+	    <input TYPE=\"HIDDEN\" NAME=\"searchwhat\" VALUE=\"$searchwhat\">";
+
+	foreach($fields as $aField)
+	{
+	    echo "<input TYPE=\"HIDDEN\" NAME=\"fields[]\" VALUE=\"$aField\">";
+	}
+
+	echo "<input TYPE=\"HIDDEN\" NAME=\"join\" VALUE=\"$join\">";
+}
+
+?>
 <!-- start of App query -->
 <table border=1 width="100%" cellspacing=0 cellpadding=3 bordercolor=black>
   <tr>
@@ -10,7 +125,7 @@
       Vendor Name:
       <input TYPE="TEXT" NAME="searchfor" /> (leave blank to match all)
 <?php
-include(BASE."include/"."appbyvendor_inc.php");
+include(BASE."include/"."appbyvendor.php");
 
 output_appbyvendor_forminputs();